Skip to content

Adjusted hub upgrade database migration to show only actionable logs (3.21)#1513

Merged
craigcomstock merged 3 commits intocfengine:3.21.xfrom
craigcomstock:ENT-12383/3.21
Nov 18, 2024
Merged

Adjusted hub upgrade database migration to show only actionable logs (3.21)#1513
craigcomstock merged 3 commits intocfengine:3.21.xfrom
craigcomstock:ENT-12383/3.21

Conversation

@craigcomstock
Copy link
Copy Markdown
Contributor

@craigcomstock craigcomstock commented Oct 16, 2024 •
edited
Loading

  • Adjusted hub upgrade database migration to show only actionable logs

  • Revert "Adjusted calling pg_upgrade during upgrade to include LD_LIBRARY_PATH of previous installation"

  • remember to re-do the changelogs in enterprise when this goes in, and remove

        Packaging changes:
	- Adjusted calling pg_upgrade during upgrade to include LD_LIBRARY_PATH of previous installation
	  (ENT-11853)

@craigcomstock
Adjusted hub upgrade database migration to show only actionable logs
918f38a 
If pg_upgrade fails it is OK because we have several other options which we try during hub package upgrade.

To see any errors, run the upgrade with DEBUG=1 defined as an environment variable.

Ticket: ENT-12383
Changelog: title
(cherry picked from commit c3bbbc3)
@craigcomstock
Revert "Adjusted calling pg_upgrade during upgrade to include LD_LIBR…
8a61122 
…ARY_PATH of previous installation"

In the case of 3.21.5 (postgresql 15.6) to 3.25.0a (master, postgresql 17.0) pg_upgrade seems to work fine with the removal of LD_LIBRARY_PATH pointed at the backup.

In other cases we will simply ignore pg_upgrade failures and allow the subsequent migration methods to proceed.
This reverts commit e39924c.

(cherry picked from commit 2c74496)
@craigcomstock craigcomstock mentioned this pull request Oct 16, 2024
Merged
@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 16, 2024

@cf-bottom jenkins

@cf-bottom
Copy link
Copy Markdown

cf-bottom commented Oct 16, 2024

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/11298/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11298/

@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 18, 2024 •
edited
Loading

retry flaked sequential-test: Build Status

@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 21, 2024

@cf-bottom jenkins please.

@cf-bottom
Copy link
Copy Markdown

cf-bottom commented Oct 21, 2024

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/11308/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11308/

@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 21, 2024

cancelled the job changed my mind. will shellcheck and test before spending ci time.

@craigcomstock
Fixed problem with package upgrade not trying other migration methods…
52edfbf 
… if pg_upgrade fails

Ticket: ENT-12383
Changelog: none
@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 21, 2024

@cf-bottom jenkins

@cf-bottom
Copy link
Copy Markdown

cf-bottom commented Oct 21, 2024

Sure, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/11310/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-11310/

@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 24, 2024

only flakes. Looks good!

@craigcomstock craigcomstock marked this pull request as draft October 24, 2024 16:45
@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Oct 24, 2024

Will wait on master change: #1515

@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Nov 15, 2024 •
edited
Loading

I think this is ready to go: Build Status

@craigcomstock craigcomstock marked this pull request as ready for review November 15, 2024 20:50
@craigcomstock craigcomstock merged commit 3a2d3c2 into cfengine:3.21.x Nov 18, 2024
@craigcomstock craigcomstock deleted the ENT-12383/3.21 branch November 18, 2024 14:30
@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Nov 18, 2024

https://github.com/cfengine/enterprise/pull/819 (removal of changelog entry related to LD_LIBRARY_PATH which we did not end up including in 3.21.x)

@craigcomstock
Copy link
Copy Markdown
Contributor Author

craigcomstock commented Nov 18, 2024

adjustment of 3.24.x changelogs related to this: https://github.com/cfengine/enterprise/pull/818

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@larsewi larsewi larsewi approved these changes

@nickanderson nickanderson Awaiting requested review from nickanderson

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@craigcomstock @cf-bottom @larsewi